clang-tidy readability-delete-null-pointer

formatted by hand.

diff --git a/duplicate.cc b/duplicate.cc
index 3fcbd8e40e4c584011404074774fad6055ba9c07..f47c34094f0c1bf3d344b20a700310cbda0dbd57 100644 (file)
--- a/duplicate.cc
+++ b/duplicate.cc
@@ -196,9 +196,7 @@ void DuplicateFilter::process(void)
     btmp = addnode(sup_tree, newnode, &oldnode);
 
     if (btmp == nullptr) {
-      if (delwpt) {
-        delete delwpt;
-      }
+      delete delwpt;
       if (correct_coords && oldnode && oldnode->wpt) {
         oldnode->wpt->latitude = waypointp->latitude;
         oldnode->wpt->longitude = waypointp->longitude;
@@ -219,9 +217,7 @@ void DuplicateFilter::process(void)
     }
   }
 
-  if (delwpt) {
-    delete delwpt;
-  }
+  delete delwpt;
 
   xfree(htable);
   if (sup_tree) {

diff --git a/kml.cc b/kml.cc
index 32d467fbec76e1f037d85aa4b9c0871e2143c8db..6602f4f8e836b08cfae0d02e264347a212acf267 100644 (file)
--- a/kml.cc
+++ b/kml.cc
@@ -448,9 +448,7 @@ void gx_trk_s(xg_string, const QXmlStreamAttributes*)
     gx_trk_head->rte_desc  = wpt_tmp->description;
   }
   track_add_head(gx_trk_head);
-  if (gx_trk_times) {
-    delete gx_trk_times;
-  }
+  delete gx_trk_times;
   gx_trk_times = new QList<gpsbabel::DateTime>;
 }
 

diff --git a/main.cc b/main.cc
index 57384b5d2f9fee38351d4f9719c536d5adaa3eb5..d466fc23da4fda83dd8d47619db46c972df18ae7 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -700,9 +700,7 @@ main(int argc, char* argv[])
       wpt = ivecs->position_ops.rd_position(&tracking_status);
 
       if (tracking_status.request_terminate) {
-        if (wpt) {
-          delete wpt;
-        }
+        delete wpt;
         break;
       }
       if (wpt) {

diff --git a/radius.cc b/radius.cc
index 6d47b06ee57dd36873e5ce7ae48352a81fbaee10..17014d25a5432a61ddec1ea1cf71f1cef870afc6 100644 (file)
--- a/radius.cc
+++ b/radius.cc
@@ -156,7 +156,7 @@ void RadiusFilter::init()
     pos_dist = strtod(distopt, &fm);
 
     if ((*fm == 'k') || (*fm == 'K')) {
-      /* distance is kilometers, convert to feet */
+      /* distance is kilometers, convert to miles */
       pos_dist *= .6214;
     }
   }
@@ -179,9 +179,7 @@ void RadiusFilter::init()
 
 void RadiusFilter::deinit()
 {
-  if (home_pos) {
-    delete home_pos;
-  }
+  delete home_pos;
 }
 
 #endif // FILTERS_ENABLED